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