Merge "Add a new feature flag for Settings Schedules"