Merge "Clean up MediaRouter2Manager" into rvc-dev