Merge "Fix discard changes when flex clock customization" into main