Merge "Make emulator window title bar visible on windows" into studio-1.4-dev