Merge "Camera3Device: Fix regression to old camera API operation."