Merge "Fix TextureLayer test" into nyc-dev