Merge "libsuspend: always unblock early suspend"