am ee5b470b: am b8f7475c: am e269ca42: Merge "Ensuring that snapToPage is completely aborted / cleaned up upon setCurrentPage (issue 11003904)" into jb-ub-now-indigo-rose

* commit 'ee5b470b341be0908333a1ae03f323d0b614e032':