Merge "Null out context for all split controllers" into main