Merge "Use Event_ShowWindow instead of Event_TapShortcut"