Squashed commit of the theme engine support.

Change-Id: I8df16a6f2911808e979daf645834cd24badf67e1