Merge "Fix sonar issue AppExitHandler"