Merge "Camera: Re-run metadata-generate"