Merge "Fix crash on boot" into jb-mr1-lockscreen-dev