Merge "Untangle listeners mess in IncrementalService" into sc-dev