Merge branches 'pm-sleep' and 'pm-runtime'