Merge "Fixed a bug where the notifications would jump when going to the full shade" into mnc-dev

            return row.getIntrinsicHeight();

        } else if (child instanceof ExpandableView) {

            ExpandableView expandableView = (ExpandableView) child;

            return expandableView.getActualHeight();

            return expandableView.getIntrinsicHeight();

        }

        return child == null? mCollapsedSize : child.getHeight();

    }