Merge "Propagate UserHandle from SysUI to the MediaRouterService" into main