Merge "Avoid lingering "hover" after emulated touch" into emu-2.0-release