Merge "Add Collapse/Expand action to QS" into main