am c8bd00d2: Merge "Fix star/unstar on empty contacts by stopping caching them" into lmp-dev

* commit 'c8bd00d2119313e454b2ef55ffaf04db3e257120':
  Fix star/unstar on empty contacts by stopping caching them