Merge "XSS Vulnerability fix in AppContactUsController"