Merge "Enable conditional handling of drags." into nyc-dev