Merge "Keep the conversation shortcut criteria in People Service consistent with the one in Notification Manager" into rvc-dev