Merge "Add more secondary timer carrier config" into main