Merge changes from topic 'sort-order'

* changes:
  Migrate phone account sorting to use lamba expressions and add test.
  PhoneAccounts sorting