Peek: adjust timeout and wakelock slightly

-7 seconds for timeout and 15 seconds for wakelock shouldnt effect battery too much
Merge remote-tracking branch 'upstream/ose' into ose