Merge "Improve scoped spinlock implementations"