Merge "Bug 5567648 disassociate audio mode and audio focus"