Merge "Prevent conversations with bots from being in the people section." into sc-dev