Merge "Add PendingIntent flags"