Merge "Adding support for custom page indicator markers." into jb-ub-gel-agar