Merge "resourceloader: Replace some Xml::encodeJs calls with RL's own encodeJson"