Revert^2 "Create controller for desktop prototype 2"

f3c7cc853a1e99bfb44f98191124d7235ffb67e1

Change-Id: I23ae45dad7570a89e3650564ec4def3af65f1576
5 files changed