Merge "Don't show no sim when a sim has been detected." into oc-mr1-dev