Merge "Make mutable PendingIntent explicit" into tm-qpr-dev