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

* commit '0c5fb2eea730548d0f0e64b8383f7d43e0c02bf0':
  Fix a mess in contexts/surfaces reference count