Merge "[flexiglass] Fixes crash when opening QS from Shade" into main