Merge "[WifiSettings] Add Wi-Fi dialog activity"