Merge "MediaRouter: Enable volume group expansion" into mnc-ub-dev