cypress: allow lights to be triggered by keypress or by keypress and touchscreen

Change-Id: Ib8d941b26fbc9b8cb4afcc0ea86039896679a301
Merge branch 'cm-10.1' into martincz