Merge "Use the current padding instead of the default one during layout." into sc-dev