Merge "Device manager selection"