Merge "Fix NPE when accessing mCallback in BluetoothGatt"