am 732a1223: Merge change I42d00fbe into eclair-mr2

Merge commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c' into eclair-mr2-plus-aosp

* commit '732a1223b21cef3561ffbbb9f6ec2d2d2a8b5e5c':
  fix issue with plugin surfaces not updating properly within the view system.