Merge "Move things in InputWindowInfo to enum classes"