Merge "Correct the target app token for input method window"