Merge "Sort framework-connectivity-defaults libs alphabetically" into main