Merge "Fix incorrect QS paddings after relayout" into sc-v2-dev