Merge "hal: optimize switch from combo to solo device"