QS > SB

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>
Merge branch 'kk-4.4' into kk-battery
Possible fix for SystemUI NPE

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>