Merge "Adjusting paddings in ShadeHeader to allow for hover state" into udc-qpr-dev