Merge "Don't double-set keyframe values when Property exists"