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

Change-Id: Iadeeb7937feed24f8b591aac36da3d90a7a1e4d2