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