Merge change 27238 into eclair

* changes:
  The touch screen is probably a feature.