Merge "Bluetooth: Ensure only desired intents are being handled" into oc-dev