Merge "When disconnecting a surface, cancel don't queue the buffer" into jb-mr2-dev