Merge "Make sure that touches are within the physical frame." into pi-dev am: 22f1e9cfb7
am: 19bf4de159

Change-Id: Ibea3ffe196312fcd81f7b8bea1ca8b28d7e18f47