Merge "Fix synchronization in updateImeTargetWindow"