Merge "Reorder and comment MediaFocusControl code"