Keep the display on while stopwatch or timer is running - CM

Change-Id: Id192d12b7e42c30cf8c2c258e885badfc3c02cb3

Conflicts:
	res/xml/settings.xml