Merge back earlier cpuidle material for v5.1.