Merge back earlier 'pm-sleep' material for v4.4.