Merge change I85f598e0 into eclair-mr2

* changes:
  Prevent transparent region from getting out of sync with Surface Flinger