Settings: Move "Double-tap to sleep" option under Display settings

Move dt2s above dt2w option so users don't get confused.

Change-Id: I910eb6624536b437d0bf14f64c1eeacafaa59cfa
Merge branch 'cm-11.0' into kk_mkt

Conflicts:
	res/xml/display_settings.xml

Change-Id: I71994b975212eb2f40b1088014e0c11206eb066b