Merge change I994fc479 into eclair

* changes:
  Send RESULT_CANCELED when missing, return legacy Uris.