Merge "[People Service] Remove conversations without corresponding shortcuts in ShortcutManager" into tm-qpr-dev