Merge "Use the correct way to remove the logical ID of UiCC slot." into main