Merge back earlier cpuidle updates for v5.13.