Merge "Fixes for touch exclusion region"