Merge "Create old or new provider in Bubbles and CentralSurfacesImpl tests" into main