Merge "Fixing issue with scrolling tasks upwards" into nyc-dev