Revert "systemui: Fix crash on theme change"

This reverts commit 242e6ab22db409f5582f2f1551bf6420cb505b26.

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