Merge "WifiController: Add delay for letting wifi module clean reset"