Merge "Revert "Fix runtime reboot when connecting to a A2DP headset and"" into kraken