Merge "Add null check before invoking onChallengeInterruptFinished"