Fixes page control
Merge branch 'fix/badge-scroller' into develop

* fix/badge-scroller:
  Fixes page control