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

* commit 'b8fe7e8bffea93ceb30a0d827f2ac573472507dd':
  QS Edit: Better handling if drags

Change-Id: Id24e45b73846ef9d52feea537382f01eb2872ad4