Merge "Set the property ID before writing freeze frames"