Merge "Fix missing grouping after shade closes" into main