am 23cc50e4: Merge "Undemote contact when starring" into klp-dev

* commit '23cc50e49f33679b39d260855d2c875f80eab1a7':
  Undemote contact when starring