Fix gna bug #21017 (grid lines on y axis do not show if on top)
Merge branch 'master' into rearrange