Merge "Revert "Fix ping pong progress in the Kawase implementation."" into main