Merge "(bug 42064) Make EditFilterMergedContent more generic."