Merge "fix subsystem sleep state to use correct puller"