Merge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment"