Merge "Making sure window inset controller is not null" into main