Merge "Bluetooth airplane listener: Check for null" into rvc-qpr-dev