Merge changes Iceadf4a1,If2b6b06b into main

* changes:
  Final (?) touches to people/apps/sound circles
  Show icons for allowed contacts