1. Fix issues caused during SoftAP mode change 2. Improve SoftAP PMF logic for triggering of SA Query and cleanup