Prevent double escape of content to be edited

Due to recent changes a variety of content was being double
escaped, this is a temporary fix until the new frontend comes
in.

Bug: 65143
Change-Id: Ifcf8a838776fc2148a0671c57fb03beea356f84d
Merge "Prevent double escape of content to be edited"