Merge commit 'origin/bug_478_Listbox_ScrollbarMode'