Merge "Add WifiManagerShim" into main