Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev