Merge "wifi(implementation): Increase stop timeout" into oc-mr1-dev