Merge "Reduced the retry after disconnect delay" into oc-mr1-dev