Merge "Send library context to ApiFactory"