Merge "Add handling of permanent disabled sims" into udc-dev