[Backport release-3_40] restore fill brush when switching back to single and double box scalebar (fix #37413)

[Backport release-3_40] restore fill brush when switching back to single and double box scalebar (fix #37413) #47800