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

Change-Id: I78f16e06ce96dbf02b3f2779a42e9063e2354c98