Merge "Fix a nullptr deref in ref VHAL." into main