Merge "Resolve TODOs in MediaRouter2"