Merge "Don't store old pending intents in NotificationTemplateViewWrapper" into main