Merge "Add test for different pendingIntents" into main