Merge "core: Ensure presencestate subtype and message are NULL."