Merge "Update background colors for convo tiles" into sc-dev