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

Change-Id: I633810761472062cecfdc51118c2fc2fbef7ad6f