Merge "LockSettingsShellCommand: improve an error message" into main