Merge "cmds: Use getInternalDisplayToken API"