Boost frequency on touch for 500ms instead of 200ms. Also a bit of rework.

Signed-off-by: Francisco Franco <franciscofranco.1990@gmail.com>
Merge remote-tracking branch 'upstream/nightlies' into nightlies
Merge branch 'nightlies' into test