Merge "Fix NPE on some phones at startup." into jb-dev