Lockscreen shortcuts: Fix icon pack usage

Change-Id: I1497cece97f90c76c3930a3a004a2d40416e13ed
Return: Always show battery on Keyguard [2/2]

Based on the feature by burnsra in CM7

Authored by blunden
Tweaked  by dvtonder
Tweaked  by kufikugel

PS 4 : Fix multi-user

Change-Id: I834dd4c7e742c1f0537773c0af6b6ece5b1c306d
Merge remote-tracking branch 'settings/kitkat-remix' into remix-legacy