Merge "Fix ScrimControllerTest memory leak" into main