merge changes from CyanogenMod 10.2 into local branch

Change-Id: Ia80d76e3068c94d49a6a62222b7ee0255fd604cf
Lockscreen: remove magnetic targets

[log]

Change-Id: I2701363e7594a60ab51128ecc208ef2d7a0c13a7
Make BatteryBar respect lights out mode

[log]

Change-Id: I1e8317a7c8afb91cd75c4d1906e37c8b3f238921