Merge "[flexiglass] Fix Gone->QS Transition and HUN placeholder" into main