Revert "systemui: Fix crash on theme change"

This reverts commit cddd07b12f402f27300d413bf2b54a4ce9dbd6e3.

Change-Id: I5456556d151287f351f1f391a87c7510ed0db547
Merge "Revert "systemui: Fix crash on theme change"" into kitkat-caf