Merge "Assign display field when creating WindowState" into main