Merge "Update mState if try again is successful" into 24D1-dev