Merge "Revert^2 "Change HVAC_MAX_DEFROST_ON to front and back row area IDs"" into main