Merge "Revert "Split settingslib_main_switch"" into main