Merge "Fix potential NPE when MessagingMessage's message is null"