Merge "Update trace config for power testing" into main