Merge "shell: Add NO_LOCALSETTINGS restriction"