Just a bit of code cleanup and also moving the scrollbar margins to the padding. The view probably shouldn't overlap the scrollbar. (cherry picked from commit 5b17afe1)