Merge "Revert "Show no_sim icon when no SIM card is available."" into klp-dev