Merge "Fix restore credential manager providers" into main