Merge "evs: Use getInternalDisplayToken API"