Merge "Fixing issue where the page was reset to 0 on rotation." into jb-ub-gel-agar