Merge "Update conversation bubble settings" into rvc-dev