Merge "Fix unsuspend from dialog on secondary users" into rvc-dev