Merge "MediaRouter: Adjust correct volume slider for volume changes" into mnc-ub-dev