Merge "Fix sub scroller bounds checking"