Merge changes Ib8b3a874,I7935231d into main

* changes:
  Log event when tapping on do not bubble convo
  Log event when tapping on app settings