Merge change 26076 into eclair

* changes:
  Show images while in picker mode, but disable fasttrack.