Bug 919894 - Unify some wording in settings -> Screen lock
Merge pull request #12733 from robhudson/919894-unify-wording-in-settings

Bug 919894 - Unify some wording in settings -> Screen lock r=crh0716
Bug 923152 - Group non-latin names on import contacts