Merge "Fix Skia filter behavior test" into nyc-dev