Merge "Null checks in register/unregister BT Adapters"