Merge "Fix NPE crash in MainClearConfirm"