am b20f0928: Merge "Fix NPE in AttachPhotoActivity after rotating while cropping" into klp-dev

* commit 'b20f092859ec1626accca8c1f8552378c845a886':
  Fix NPE in AttachPhotoActivity after rotating while cropping