Merge "power: smb2: fix QC2 adapter collapse"