More DynamicPagerAdapter fixes

fixes #2223