Merge "Fix the padding for top intro preference" into sc-dev