am 7660bb58: Merge "Fix a mess in contexts/surfaces reference count"

* commit '7660bb5806c285bc5646ad5868b9197012943bcb':
  Fix a mess in contexts/surfaces reference count