Merge "Refresh sim lock state when carrier config is changed"