Merge "Update IME control target when windowConfiguration changed" into sc-dev