Merge branch 'andamio2-pager-on-android' into andamio2-jaws