Merge pull request #1768 from abarth/scroll_padding

ScrollableList was applying padding twice