Merge "Add handling of permanent disabled sims"