Merge "Add STATE_USER_SETUP_COMPLETE"