Merge branch 'cm-10.2' of git://github.com/CyanogenMod/android_frameworks_base into cm-10.2
NFC Polling Mode (3/3)
MediaScanner behavior on boot (1/3)
Lets you enable/disable/ask (with a notification) media scanning on boot.
Can speed up boot and reduce initial boot lag from MediaScanner

Change-Id: I634ae96b1dcb493b966b4653589cd97523b63da7

Conflicts:

	core/java/android/provider/Settings.java
Frameworks: Toggle to disable fullscreen keyboard (1/2)

Conflicts:

	core/java/android/provider/Settings.java
Merge remote-tracking branch 'temasek/cm-10.2' into cm-10.2

Conflicts:
	core/java/android/provider/Settings.java

Change-Id: I554f1235fe082f21165f66e638346537ede0e246