Merge "Audio focus: clean up FocusRequester early" into nyc-mr1-dev