Merge branch 'suspend-to-idle'