Merge "[WifiDialog] Suppress activity transition"