If you used unexpired I-94 to return from Canada, technically, for the last lawful admission purpose, this was not your last entry. But that won't be examined until the I-485 adjudication stage. What you put on the EAD or AP form now doesn't really that important.