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

Change-Id: I20cfb30818f7e06fc614dae734204db089e530bf