Merge "Fix background color of the conversation guts" into sc-dev