Merge "Ensure setLayerType pushes Paint changes"