Merge changes I848ba9b1,I03a75b45 into pi-dev

* changes:
  ClientModeManager: immediately clean up state onDestroyed
  SoftApManager: no teardown when iface destroyed
tree: 5dbb8d367a8368bd4b216b9de2675586327774ba
  1. service/
  2. PREUPLOAD.cfg