Merge "Don't send ACCOUNT_REMOVED if account is marked as visible twice." into main