Merge "MediaRouter: Workaround for b/23703214" into mnc-ub-dev