Merge "Bigger lock icon." into jb-mr1-lockscreen-dev