Merge suspend-to-idle rework material for v5.4.