Merge "Revert "Check Bundle when creating/sending a PendingIntent"" into main