Cleanup app->{theme1,theme2...} mapping on uninstall

Change-Id: I24b43e8817db1927d5b43fcf7ad3340269d046ea
Merge "Cleanup app->{theme1,theme2...} mapping on uninstall" into cm-11.0