Merge "Clean up ApiEditPage content handler undo logic"