5.5.1
Merge pull request #17078 from jiawulin001/issue#17077
fix(bar): merge logic of layout large and normal bars