Active Display: Add 1 hr display timeout
Active display: allow hiding low priority notifications [2/2]

Change-Id: I244743ed1a32f59065af3c4507f4132b7d3b0d72

Conflicts:

	res/values/cm_strings.xml