Merge "Remove extra padding in QS header" into sc-dev