Merge "Revert "MediaRouter: expand group volume section as much as it can"" into mnc-ub-dev