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

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