Merge "Fixed a bug with the scrolling after expanding a notification" into nyc-dev