Merge back earlier suspend/hibernate material for v4.1.