Merge change 26323 into eclair

* changes:
  Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.