Merge "Remove outdated comment in MediaFocusControl"