Merge "[Catalyst] Migrate Wi-Fi switch preference" into main