am 85c4281a: Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev

* commit '85c4281aae518c27ca3f95e330f6aa56159e1328':
  Fixing up overscroll asset / sizing