Merge "Improve log message for locksettings shell commands"