Merge "Make PendingIntent immutable"