Merge change 27109 into eclair

* changes:
  Show the thumbnail box even if there is no picture taken yet.