Merge "Avoid weird expand animation when a notification is updated am: bb42b7dd48 am: b438c11564 am: 4640f9a7ce"