Merge "[Catalyst] Migrate Airplane Mode preference" into main