am 1bb55501: Merge change I85f598e0 into eclair-mr2

Merge commit '1bb5550107eae60993dc35f2e917cb664f841255' into eclair-mr2-plus-aosp

* commit '1bb5550107eae60993dc35f2e917cb664f841255':
  Prevent transparent region from getting out of sync with Surface Flinger