Merge "Update api current.txt with context type annotations" into sc-dev