Merge "Update mState if try again is successful" into main