Remove the CM Theme Engine Settings
Merge kitkat2 into kk44
Merge remote-tracking branch 'upstream/kk44' into kk44-test