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