Merge "Fix ViewRootImpl traversal issue after SurfaceSyncGroup timeout" into main