Merge "Fix sp<> crash on stack-allocated service object."