DeviceSettings: Maybe really fix Activity icons and labels
Fix UKMS toggle
Fix icons and titles in fragment activities
fix previous commit
Merge pull request #3 from TeamCanjica/cm-11.0

Update