Settings: fix NPE with null check on NFC adapter

Verifies the adapter is not null before dereferencing it and log and error if so

PS:
- fix codestyle and rebase

Change-Id: Id2a34c4698a97476bee9b78cb0ac7b980d1595cf
Settings: Fix Bug Tile Size (1/1)

As reported very well by
	user Natakranta:

http://forum.xda-developers.com/showthread.php?p=49457919#post49457919

Layout files will take care of scaling down in this case.

Change-Id: Id80d1003c9e569ed9c4e2eca2c6c164473918590
Make Privacy Guard a first class citizen in the Settings app.

Change-Id: Ie45e21cfa5190307923edf65f8ff5356fa305d70
Settings: Add option to always show battery status on lockscreen (2/2)

Based on the feature by burnsra in CM7
Authored by blunden
Tweaked by dvtonder
Change-Id: I1c8c8eef3d0c913c621f735e7d5e395c8768fe76

lockscreen battery status: add off option (1/2)
Change-Id: I06dd1b81826bdb1c1e35b72d99970f97dcad1a34

Conflicts:

	res/values/cm_arrays.xml
	res/values/cm_strings.xml
	res/xml/lockscreen_interface_settings.xml
	src/com/android/settings/cyanogenmod/LockscreenInterface.java
Settings: Glowpad Torch (3/3)

PS2: String edit & remove from
	devices without torch.

Change-Id: Ide6fae8d35afb7f031aefcf6f5703ba57cf1f51d

Conflicts:

	res/xml/lockscreen_interface_settings.xml
Settings: Fix broken sliders on menu reset (1/1)

Change-Id: I5a28b1a02a01c8b3d23ab746b1ff5131d2952e6c

Conflicts:

	src/com/android/settings/temasek/quicksettings/QuickSettingsTilesStyle.java
Settings: Fix up top level "Privacy" section

Change-Id: Id4dbda10a891c793bc6eb3c42807cc0e3f6092cc

Conflicts:

	src/com/android/settings/SecuritySettings.java