Merge "Include getPublicLogMessage() in double-exception messages"