Merge "Make emulator window title bar visible on windows" into emu-1.4-release