fix npe
Merge branch 'origin/EditProfileFlow'