Merge "Hide demoted conversations from People service" into sc-dev