Merge "[bc25] Support both horizontal and vertical alignment in dual shade." into main