Merge commit 'b1c7028' into merge_try2

        InCallPresenter.getInstance().removeIncomingCallListener(this);

        InCallPresenter.getInstance().removeDetailsListener(this);

        InCallPresenter.getInstance().getInCallCameraManager().removeCameraSelectionListener(this);

        InCallPresenter.getInstance().removeCanAddCallListener(this);

    }

    @Override

package com.android.incallui;

import android.content.Context;

import android.content.res.Resources;

import android.graphics.Matrix;

import android.graphics.Point;

import android.graphics.SurfaceTexture;

import android.graphics.drawable.Drawable;

import android.os.Bundle;

import android.telecom.VideoProfile;

import android.view.Display;

import android.view.LayoutInflater;

import android.view.Surface;

import android.view.ViewTreeObserver;

import android.widget.FrameLayout;

import android.widget.ImageView;

import android.widget.Toast;

import com.google.common.base.Objects;

     */

    public static final int ORIENTATION_UNKNOWN = -1;

    /**

     * Invalid resource id.

     */

    public static final int INVALID_RESOURCE_ID = -1;

    // Static storage used to retain the video surfaces across Activity restart.

    // TextureViews are not parcelable, so it is not possible to store them in the saved state.

    private static boolean sVideoSurfacesInUse = false;