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

Change-Id: I2c778a13f8b7312691916fd554e1855d3cb2f475