Merge "Vendor API level 202404 is now frozen" into main