Merge "[sf] Update touchable region crop correctly" into udc-dev