Merge "[Catalyst] Sync APM preference key value" into main