Squashed commit of the theme engine support

Change-Id: I429f2e1e7f3c4b8e998af940bb6cc9cb2e6f5a7a