Merge "Show the icons in QS/SB as long as the default is default" into sc-dev