Merge "Make mutable PendingIntents explicit"