Merge "Fix NPE in Display Settings." into jb-dev