Merge "Improved animation logic of the new notifications"