Merge "Remove flag plugin with flag manager with DI" into sc-v2-dev