Merge "Revert "Clean up ApiEditPage content handler undo logic""