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