Merge "Avoid playing taskbar haptic when swiping up from home" into main