Merge "Mark app pending intents in notification extras" into nyc-dev