Merge "Fix native crash while saving a panorama." into jb-mr1-dev