Merge "Fix bug 3275151 Request and abandon audio focus with audio mode changes"