Merge "Enable qs open while shade expansion is still running" into sc-dev