Merge "Reduce the lock protected scope in People Service ConversationStore"