Merge "Re-enable concurrent system weak sweeping." into klp-dev