HeadsUp: User configurable timeout (2/2)

Change-Id: I6c55636205237044891324f0dd855046aaafb256

Conflicts:
	res/values/cm_strings.xml