Merge "Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into oc-dev