Merge "Continue refactoring MediaFocusControl"