Merge change I14fec660 into eclair

* changes:
  Fix NPE being thrown when starting the AttachImage activity.