Add check for EditFilterMergedContent handler registered in EditEntity

Change-Id: Ib9cda3ed1adae87f05e1c0ae8a5ba5ea1161db5e
Merge "Add check for EditFilterMergedContent handler registered in EditEntity"