Merge "Add scrolling to QS" into main