Merge "Fixing NPE on attaching a photo in portrait mode" into honeycomb