fix expanded desktop when Pie is not enabled

Change-Id: I5eee9b9dc852156577b07ec109ee74d89cb0db74
Themes: uninstallThemeForAllApps shouldn't check if map is empty if it's null

Potential NPE introduced in ec2200878706735cdd2caf4d934d988296998e85

Change-Id: I6d1ec165957c2be63086a18af2236e46978e9c8a