Merge "QS Edit: Try to simplify drag logic" into nyc-dev