Merge "Change window enum names" into devel/master