Merge "[WifiSetup] Don't show menu during setup"