Merge "[Bugfix][API-740] set mannual network selection will block procedure afterwards" into MR3.0-merge