Fix handling of focus/click on buttons
Merge branch 'next-demonic' into next-eve