Merge back earlier suspend/hibernation changes for v4.8.