am 748bdbdc: Merge "Fixing NPE on attaching a photo in portrait mode" into honeycomb

* commit '748bdbdc9b08ddf3d53cdb2812e4c52c0e3d0546':
  Fixing NPE on attaching a photo in portrait mode