Merge "Use shared lib for settings v2." into main