Merge "Add the settings' metrics into SPA" into main