Merge "Remove refs of isSeparateProfileChallengeAllowed"