WL-1892 Switch to displayId instead of EID.

For most places EID == displayId but not here.