Merge "Immediately hide the icons when QS starts to expand" into sc-dev