Merge change I7495977a into eclair

* changes:
  Add cancelThumbnailRequest to thumbnail API.