Ensure scroller size is being adjusted.
Merge branch 'per_page_fit_mode' into test_per_page_fit_mode