Merge "Prevent crash when setting up a stencil-based clip Bug #8177690"