Merge "Fix drags from the shirt pocket"