Merge "Making window borders visible in WIN32" into emu-1.4-release