Merge "Adjust idle timings." into main