Merge "Phase out shell-transit flag by adoption" into main