Merge "Fixes deadzone consuming touch for 3 button layout" into pi-dev