Merge "Revert "Revert "Add STATE_USER_PROFILE_FINALIZED as an additional user state"""