Merge "Add WIFI_ENABLED and WIFI_DISABLED to StaEvent"