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