Merge "Remove last row bottom padding in QS" into sc-dev