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