am 8ac3ed8e: am 849d1201: Merge "Finished getting rid of mPageSpacing" into jb-ub-now-jetsonic

* commit '8ac3ed8edd99209695096c2d1cbf4a7b0184b190':
  Finished getting rid of mPageSpacing