Merge branch '1633-gtk-3-24' into 'gtk-3-24'

Issue #1633 - Ensure focus on click

See merge request !560
2 jobs from gtk-3-24 in 6 minutes and 23 seconds (queued for 3 seconds)
Status Job ID Name Coverage
  Build
passed #206185
build

00:06:23

manual #206186
win32 allowed to fail manual
msys2-mingw32