Merge "Re-add volume slider to the MediaRouteControllerDialog" into lmp-mr1-ub-dev