Merge change 5923

* changes:
  Fixes for moving a focused textfield on screen when entering a character.