move the timeout and scheduler delay on the same setFeatures function(uint64_t)

Change-Id: I52ed61d660fd50f02ee6887b93b15eb0d8f24191