Merge "Fix apex_available value in Connectivity" into main