Merge "XSS Vulnerability fix in AppsControllerExternalRequest"