Merge changes I848ba9b1,I03a75b45 into pi-dev

* changes:
  ClientModeManager: immediately clean up state onDestroyed
  SoftApManager: no teardown when iface destroyed