Merge "Fix setLayerType"