Merge "Add javadoc to Window.set/getMediaController" into lmp-dev