Merge "Added WifiSettings -> WifiSettings2 redirection behind feature flag"