Merge "Undemote contact when starring" into klp-dev