Merge back suspend/resume/hibernate material for v4.15.