Merge "Rename HardwareLayer -> TextureLayer"