Merge "libdm: suspend and resume devices"