Merge "Fix Settings NPE" into jb-dev