Merge "MediaRouter: Prevent activity from restarting" into mnc-ub-dev