Merge "Register proxy router after ProxyMediaRouter2Impl has been created" into main