Wake Gestures: various improvements and fixes

Change-Id: I197240c0abc59ce8d3ee3ff0fd0ef22f863a554c
Signed-off-by: flar2 <asegaert@gmail.com>