Merge "Add carrier config for NR timer reset" into rvc-d1-dev