Merge "Modify the condition of MENU_FIX_CONNECTIVITY" into main