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

Change-Id: I11dc506d4143673ed092b70c8f939c4d3d67b200