Merge pull request #20818 from lightsofapollo/l10n-categories

Bug 1028325 - Use mozillas locales where possible when displaying the co...
Merge pull request #20824 from lightsofapollo/bug-1027925

Bug 1027925 - Ensure that icon remove button is above the icon and give it extra padding to make it clickable.
Merge pull request #20875 from KevinGrandon/bug_1028681_collections_pinning_entry_points

Bug 1028681 - [Collection app] Contacts and Phone apps cannot be added to Smart Collections
Merge pull request #20505 from jimporter/ringtones-icons

Bug 1020588 - [ringtones] Update the ringtone app's icon