Merge "EmulatedCamera: Fix up camera result metadata" into main