Merge "Fix race condition with 'leaveShadeOpen'" into main