Framework: fix theme engine merge

Change-Id: If4b0934722a113b63f0e18598799366510169a88
Signed-off-by: Roman Birg <romanbirg@gmail.com>
Merge "Framework: fix theme engine merge" into kitkat