Merge "QS Edit: Fix drag to add tiles going away" into nyc-dev