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

* commit '1fd01cecf5af5a616f814a154ba2c217eac14bd1':
  When disconnecting a surface, cancel don't queue the buffer