Merge "Do not respond to long click when using mouse" into main