Merge "Framework: fix theme engine merge" into kitkat
Merge "AssetAtlas: Fix NPE when there are no preloaded resources" into kitkat