Merge "Fix lockscreen slider bugs" into jb-mr1-lockscreen-dev