Merge "Do not remove enumerate client immediately when user switches"

        if (getCurrentClient() instanceof InternalRemovalClient

                || getCurrentClient() instanceof InternalEnumerateClient) {

            Slog.w(getTag(), "User switched while performing cleanup");

            removeClient(getCurrentClient());

            clearEnumerateState();

        }

        updateActiveGroup(userId, null);

        doTemplateCleanupForUser(userId);