Merge "Add the new 'settings' shell tool to the build" into jb-mr1-dev