Merge "Inject MediaRouter2Manager in MediaOutputController"