Theme Engine [4/7]

Bring in logic for the new chooser. If TMO chooser is installed it will get
first priority.

Change-Id: Ifbbd6c300646bacb563d468ae59e2922aa3ce619