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

* commit '62f593fa2daf2ebc1ba3d10dc4a46dbd2ef3bf39':
  Fix a mess in contexts/surfaces reference count