Merge "Disable haptic feedback on items in Folders." into ub-launcher3-dorval-polish
am: 663bb990f0

Change-Id: I619db88f33453a3008e794d838effe3d29de7cb4