Merge "Fix a bug with updating extras in a PendingIntent with an intent stack" into jb-dev