Merge "[Catalyst] Migrate Adaptive Battery Category" into main