Merge "QS Edit: fix some move logic" into nyc-dev