Merge "Handle revisions with different content models in EditPage"