Merge "Handle possible NPE in MessageListItem"