Merge "Support for stencil clipping in layers"