Merge "MediaRouter: Use a fixed height for individual volume sliders" into mnc-ub-dev