Merge "Add three new developer settings" into jb-dev