Merge "Take into account surface insets when replacing touch region." into udc-dev