Merge change 4450 into donut

* changes:
  Fix issue 1921166: Cropped image is not displayed after cropping a picture from Gallery picture view.