Merge "Fix toggle when no_user_switch is applied without EnforcedAdmin" into main