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

* commit '3e693f9fe585dff94680e9f20db6fb519dd40414':