Merge "Add persistent state for Bluetooth high quality audio support" into oc-dev