Merge "Introduce flag for zero jank feature" into main