Merge "Deprecate EditFilterMerged hook, final ContentHandler replaced hook"