Merge "Audio focus doesn't affect RemoteController"