Merge pull request #24319 from EragonJ/bug-1071387

Bug 1071387 - [Settings] STK icons are missing and SIM labels is above o...