Merge "consolidate subsystem sleep state atoms"