Simplify e2wm:dp-two-display
Merge branch 'display-method' into tkf