Merge change 24642 into eclair

* changes:
  make sure conditions will return when the status of a surface is not NO_ERROR