Adds the ability to keep the placeholder text and edit it.
Fixes enhancement overlay width being wrong in the RTE.
Merge branch 'release/2.2'