Merge "Disable two line text legacy flag." into main