Merge "Removed WifiController deferred enable configurations"