Merge "MediaRouter: Fix colors" into mnc-ub-dev