Merge "Update PendingIntent target for multi-user"