Merge "Revert "Remove bubble when PendingIntent is canceled"" into rvc-dev