m7: DeviceSettings: Flick/Pick2Wake options added

Conflicts:
	DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
m7: DeviceSettings: Option to disable button backlight

Change-Id: Ieb13c146d37ed24a2dfca79852e0c429b689aee6

Conflicts:
	DeviceSettings/src/com/cyanogenmod/settings/device/Startup.java
	rootdir/etc/init.qcom.rc
Fix start up error in wrong cast

Change-Id: If59f06ae87d5ee8e9b16d150a34962fdb0375bb1