Revert Temp Use old theme engine

Change-Id: I4c6dd16f4f6bc46b969f8522ff10152cbc0cd06c
Merge "Revert Temp Use old theme engine" into kk44