Merge "Avoid to show provisioning sim card" into 24D1-dev