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

Change-Id: Ie578eae9a3f1a63cf2bc39dec949d4538e367c88