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