Merge change 24643 into eclair

* changes:
  fix [2112575] stuck on DequeueCondition for a surface that doesn't exist anymore
tree: 6a67858eec4987889d3b031f19751ba89dd74229
  1. cmds/
  2. include/
  3. media/