Merge \"QS Edit: Try to simplify drag logic\" into nyc-dev
am: 3a0241566b

Change-Id: I9b080743a60d247c63293274759cbca313d7ca05