Merge "Add @IntRange annotation to clarify expected duration value" into main