Merge "Mark shade header system icons as not clickable in non-large screen shade" into udc-qpr-dev