Merge "Fix bug 3210201 - Popup window wrong size/position when IME hidden"