Merge "Remove wear-specific touch slop overlay"