Merge "Fix LockSettingsShellCommand handling of empty old credentials"