Merge changes Ic9d1b08c,Id6db9ce2,I7b980218

* changes:
  Add zen starred contacts preference
  Clear deprecated effects when saving zen policy
  DND settings redesign