Merge "wifi: Fix single AP iface isn't deleted" into tm-dev