Merge changes Iff42bac7,I7ce5454a into cm-11.0

* changes:
  CM11 Themes: Handle legacy themes in createIdmapsForPackageLI
  CM11 Themes: Properly handle themeing apps on install