Merge "NotificationStackScroller: Fix scrollTo for notification groups" into nyc-dev