am 12b528f8: am 86306b58: Merge "Defer destroying surfaces until not current" into jb-mr2-dev

* commit '12b528f8ab017cd60a856166895e9cf6f8a4a404':
  Defer destroying surfaces until not current