Merge "Improved notification scroller animation logic"