Merge "Fix NPE from freeing expanded view while expanding." into rvc-dev

    private void updateContentTransformation() {

        int visibleType = calculateVisibleType();

        if (getTransformableViewForVisibleType(mVisibleType) == null) {

            // Case where visible view was removed in middle of transformation. In this case, we

            // just update immediately to the appropriate view.

            mVisibleType = visibleType;

            updateViewVisibilities(visibleType);

            updateBackgroundColor(false);

            return;

        }

        if (visibleType != mVisibleType) {

            // A new transformation starts

            mTransformationStartVisibleType = mVisibleType;