Merge "Fix NPE while using mLayerPaint" into nyc-dev