Merge "Fix NPE at PanoramaActivity.stopCapture()"