Cleaned up scrollbars on windows.
Merge commit '5761165'