Merge "Fix scroll bar to draw in the overlay mode" into devel/master