Merge "BT device picker: don't rescan after rotating the device"