Merge "DO NOT MERGE ANYWHERE Allow the Bluetooth MAC address to be updated asynchronously (2/3)" into cw-f-dev