Merge "Fix small style issues in ViewDragHelper." into nyc-support-24.1-dev