Merge "Add carrier config for NR timer reset"