Merge "Rename to addProviderRequestListener (framework/base)" into sc-dev