Merge "Use the icon size of starting surface for split decor" into tm-dev