Merge "Add legacy state to 5g timer configs" into rvc-dev