Merge "Sync disabling of touchpad taps with hiding pointer" into main