Merge "Revert "Made a MediaRouteButton method public.""