Active display: Option to change display timeout [2/2]

Change-Id: I2cb0252dac6563517f28123f5de0a40f4bb824bc
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/cm_arrays.xml
	res/values/cmx_strings.xml