As conflict resolution depends on whether the property was set directly or via a shorthand, we have to store the non-expanded values in the resolved keyframe properties.
