Merge "Add some padding between QS and shelf" into sc-dev