Merge "Fixed issue with IME window not been added to its window token"