Merge "Optimize flows to reduce jank" into main