Merge "Use FlickerParametersRunnerFactory" into sc-dev