Merge "Improve MediaRouter Javadoc"