Merge "Notification might not have a contentIntent"