Merge "Adjusting hover state in shade header to new visd" into udc-qpr-dev