Merge "Update error dialog text for SIM switching" into main