Merge "WifiController: remove wifi inactive code"