Merge "Fixing up overscroll asset / sizing" into jb-mr1-lockscreen-dev