Merge "Audio focus: SDK/System API updates"