Merge "Fix multi user crash when Add guest was tapped multiple times" into rvc-dev