Merge "Fix NPE in MessagingMessage" into main