Merge "[Bugfix][API-1395]fix unable to retry whitin the progression" into GSW3.0-No-Connman