Merge "Flag new MediaRoute2Info types" into main