am 048e9db0: Fix 2021864: NPE while saving picture in CropImage.

Merge commit '048e9db023de286e9576b438d4c616a53773abc8'

* commit '048e9db023de286e9576b438d4c616a53773abc8':
  Fix 2021864: NPE while saving picture in CropImage.