Merge "Don't clip when drawing a layer"