fix #12377 - Gridx toolbar with no buttons messes up tabbing
Merge branch 'master' into 1.3