Merge change 26945 into eclair

* changes:
  Change the default settings of picture size to the largest one.