Merge branch 'autosuspend' into for-next