Merge "Notification: Fix tombstones and action alignment" into nyc-dev