Merge "Move identity wait until after password is updated"