Merge "Revert and fix "Revert "EditPage: Show EditFilterMergedContent hook errors...