Merge "Hide icons in QS Header if there's a cutout" into sc-dev