Merge "Scrollbar up/down buttons and thumb should be adjusted via layout changes." into rvc-dev