Merge change I218bca82 into eclair-mr2

* changes:
  Avoid calling MediaProvider for MINI_KIND thumbnail unless really necessary.