Merge "Revert "Fix apex_available value in Connectivity"" into main