Merge "Clear mCurrentChallengeOwner when owner dies"