Merge change 26043 into eclair

* changes:
  Fix bug 2121734 (better guess at size of photo widget)