Merge "Adjusting paddings for status bar hover state" into udc-qpr-dev