Merge "Fix PendingIntent CanceledException exception"