Merge "XSS Vulnerability fix in AppsController"