Merge "Remove padding customization from stack scroller algorithm"