Merge "Camera2: add new mime type for panorama picture"