More DynamicPagerAdapter fixes

fixes #2223
Merge branch 'pageradapter' of https://github.com/devrandom/Gibberbot into devrandom-pageradapter