Merge "Fix intent used in PendingIntents" into main