Merge "Fix StackScrollerDecorView param comment not matching." into main