Fix: SystemUI NPE Crash

This commit reverts the following commits:
 - da5d2781ec08bfc077f2aa188a1eb7d01a64f39f.

 - 5c9cf76443bd6085d07dfdfc3e0be1e53350a4f3.

 Tested to work
Merge branch 'kk-4.4' of https://github.com/TheSchismROM/android_frameworks_base into kk-4.4