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

* commit '86306b587644e939c5b6d4a53d67c9b74ce24ba5':
  Defer destroying surfaces until not current