Merge change 21846 into eclair

* changes:
  Don't call onSurfaceChanged() if nothing interesting has changed.