am 557a333f: am b6075997: am a580b2c4: am 583be4d8: Merge "Fix NPE when sorting accounts lacking type" into klp-dev

* commit '557a333fa1d61dc3006f7d6bb104174ab9f86e48':
  Fix NPE when sorting accounts lacking type