Merge "Create flag for QS UI refactor" into main