Merge "Fix clipping and stencil layer issues"