Merge "Use new public API for getting proxy MediaRouter2 instance" into main