Merge "Adjust NR timer on PCI change" into main