Merge "Collapsing shade when user clicks on shade_header_system_icons from shade header" into udc-qpr-dev