Merge "Address API feedback for cross-user MediaRouter2" into main