Use new display manager API.

Also deleted some dead code.

Change-Id: I4d070b6642caf2c143eeacceeb678c102e5da19c
2 files changed