Merge "Add nullability annotations" into main