Merge change 21401 into eclair

* changes:
  make sure to update a surface's usage bits when it changes, instead of only the first time.