Merge "Finished getting rid of mPageSpacing" into jb-ub-now-jetsonic