Squashed commit of the theme engine support

Change-Id: I96d7c53164781a1a0aac032b871994dd1ae70916