Merge "Revert "Adjust ViewDragHelper to better support watches."" into mnc-ub-dev