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

Change-Id: Id1d065dfff30bfad173ef675d69b3dca835da47a