Fixed CollapsingBorder incorrect properties