Merge "Add check to sp<> raw pointer constructor"