Merge branch '3.4.x' into 3.4.x.timeout_remap
Revert "For tap/long-press timeouts: Set max to 50 ms over current val if that is lower than hardcoded (set in xml)."

This reverts commit 8858d163d8b473e9acfe6567f21c5bb19f3578d9.
Pretty printing additions in  	832c5ee
Increase max for timeouts, hardcoded:
delay_key_tap_preference: 200->400
delay_key_press_preference: 500->600
Merge branch '3.4.x.timeout_remap' into 3.4.x.g