am 49385ec7: Merge "When disconnecting a surface, cancel don\'t queue the buffer" into jb-mr2-dev

* commit '49385ec7c361347a69245c8a0838f6d03343a1de':
  When disconnecting a surface, cancel don't queue the buffer