Merge "Crop touchable region to surface bounds when updating an InputChannel" into tm-qpr-dev