Merge "Fixing issue with front task dimming when scrolled back." into nyc-dev