Merge "windows: Store the window handle in a pointer sized type" into devel/master