Merge "Restore untrusted glStencilMask value on resume after functor"