Merge "XSS Vulnerability fix in DashboardSearchResultController"