Merge "Notification: Fix PendingIntent whitelisting"