Merge "MediaRouter2: Fix getRoutes() returning an empty list" into rvc-dev