Merge "Reland slow gesture callback handling" into main