Merge "Add final backgrounds to message list items"