Squashed commit of the theme engine support [WIP]

Change-Id: Ibce0707cf516034675451d0990608bafe097c99d