Merge changes Ieb8a9aee,Iee308af4

* changes:
  Finer-grain control of people sorting via plugin
  Unit tests for PeopleHubViewController.kt