Merge "XSS Vulnerability fix in AppsOSController"