am 7193a587: Merge change 21401 into eclair

Merge commit '7193a58763ff73ba84bf4ac1c8f3f745b0a18836'

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