Remove usage of deprecated Xml::escapeJsString

Change-Id: I7df54b777cda059f0ea6a8e520ead7642dbff98f
Merge "Remove usage of deprecated Xml::escapeJsString"