Revert "Revert "New Theme Engine [4/6]""

This reverts commit 366e5c8fee1badbba30f76f40714fdd3bdf4d0d3.

Change-Id: I1331abfe48724377107933f6288139ae84c798cf
Merge "Revert "Revert "New Theme Engine [4/6]""" into kitkat