Merge "Should not switch to a user with removal in progress"