Merge "QS Edit: Better handling if drags" into nyc-dev