Merge "Add end to end mainline beta test flag in connectivity module" into main