Merge "Simplify MediaRouter2 stub unregistering logic" into main