Merge "Reduce janky frame duration" into main