Merge "[SimUiEnhancement] Fix Automatic Data switch UI at SimOnboarding" into main