Merge "MediaRouter: update visibility of media control view before measuring" into mnc-ub-dev