Merge "Add entry point for conversation settings" into rvc-dev