Add missing changes from 'Hide no-sim icon' commit