Merge "Removing support for change listeners from feature flags" into sc-v2-dev