Merge "Check sp<>::clear() for data races"