Merge "The re-try flag is not set to true when re-sending SMS at second time"