Active Display: Add option to change display timeout
cherry-pick 1bba7934c277a817e5e8614de3ab15fe1a2b9f4b
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>