Merge "[Flexiglass] Fix back handling in QS Edit mode" into main