am 30774acb: Merge "Unify tablet/phone workspace scrolling behavior" into jb-dev

* commit '30774acbb8b8711e3eef48ac9baaec99788d16a0':
  Unify tablet/phone workspace scrolling behavior