Merge "Fix issue #5016544: IME keyboard hides folder rename text field."