Merge "Audio focus: fix mapping of old requestAudioFocus to AudioFocusRequest" into oc-dev