Merge "Continue refactoring of MediaFocusControl"