Fix HW brightness miss logic

Restore default backlight when hw are anebled

(cherry picked from commit 12e1aa4b66fa4ad71cd0f68ce93dee243f1db26a)
Development Settings: Reenable Nuplayer

* Nuplayer is now the default in Lollipop, do not uncheck the setting when disabling developer options.

Change-Id: Ic47365192404a866434630a7a4f2f669b8f80233
(cherry picked from commit cdc2b778203529dd102011567bf9aafa8cea943d)

Conflicts:
	src/com/android/settings/DevelopmentSettings.java
Turn nav bar into a preference category

Conflicts:

	res/values/cr_strings.xml

(cherry picked from commit 0fc69970d607dbd917a373f4fa4604bcd81159a1)
bugfix: there are other options after in-app search

On "Settings -> Buttons -> Home Button -> Long press action" there's
a list of options. Any option after the "in-app search" one was being
ignored.

Change-Id: I136235a6798496a0a8786bad59b168845c677bdd
(cherry picked from commit 08a80b7a881c794b716ad925ced06fddcfd79524)