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

* commit '31d22ff1067ad7ce2a3a57320d8abf0d7476d59d':
  Fixing NPE on attaching a photo in portrait mode