Merge "Remove haptic on touch down Bug: 65463659" into ub-launcher3-dorval-polish2