Merge "Misc non-functional fixes in MediaRouter2ServiceImpl" into main