Merge "Revert "sde: Perform cwb teardown after each commit""