Merge "Fix some paddings in QS" into sc-dev