Merge "Tiny fix of updateListPosition in MessageList"