Merge "Fixed WrongPasswordNotifier for headless system user." into sc-v2-dev