Merge "wifi: Reset SAP state when wifi thread timeout (Fail case)" into tm-dev