Merge "[Bugfix][API-765]fota success but the slot not switch" into GSW3.0