Fix CollapsingBorder serialVersionUIDs