Merge "fix NPE in setShouldShowErrorConsole"