Merge "Improve the help text for the locksettings shell command" into main