Merge "Avoid weird expand animation when a notification is updated" into nyc-mr1-dev am: c55457b146
am: 1dfb9c3563

Change-Id: I53b36ea3a3e92bb40d58509ea6b4853471b0dda7