Merge "Remove setOutlineProvider call from layout pass" into tm-qpr-dev

        mSecondaryView = findSecondaryView();

        setVisible(false /* nowVisible */, false /* animate */);

        setSecondaryVisible(false /* nowVisible */, false /* animate */);

    }

    @Override

    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {

        super.onLayout(changed, left, top, right, bottom);

        setOutlineProvider(null);

    }