Merge "NetworkController: Hide signal strength icon when no SIM icon …