Merge "Update people UX for Demo Day"