Merge "Translating QS during LS -> Shade transition" into sc-dev