Wakelock Blocker [2/2]

Conflicts:
	res/xml/dashboard_categories.xml
	src/com/android/settings/SettingsActivity.java

Change-Id: Id88f8bd6a96cdb31ab87c5d647b79cc8fba62a72

Conflicts:
	res/xml/development_prefs.xml
	src/com/android/settings/SettingsActivity.java