Merge "Change icon mappings in MobileSignalController"