Merge "Bluetooth airplane listener: Check for null"