Merge "Add new folding grace period settings strings" into main