Merge "Add common enum type for Window" into devel/master