Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1