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

Change-Id: Ia5e43fcdab397ae1abb99ed7e6fdf30a24208740