Merge "Add null check before accessing mCurrentChallengeOwner"