Merge "Use correct horizontal padding in QS." into main