Merge "Clean up setLayerType and setLayerPaint" into nyc-dev