Merge "Add null check before getting vendor extension." into main