Merge changes Ifbc8b4dd,I96a4e3bf

* changes:
  Add config_wifi_driver_stop_delay to public.xml to fix build
  WifiStateMachine: Move wifi teardown delay to a framework resource