Merge "Fix some issues with haptic" into ub-launcher3-edmonton-polish