Merge "sde: Fix hang when CompManager:Prepare() fails with error"