Merge "power: smb: Fix PD ICL configuration flow"