am 4829b184: am 118b5d79: Allow disabling page-flipping.

Merge commit '4829b184f15350de20096a97e583ed4c2b3d6427'

* commit '4829b184f15350de20096a97e583ed4c2b3d6427':
  Allow disabling page-flipping.