Merge "Apply a min duration limit for smoother animation." into main