Merge "PM / Sleep: Clean up remnants of workqueue-based sync"