Merge "Set elevation of popup and arrow to match. This ensures no shadow overlap." into sc-dev

                    mArrowOffsetHorizontal, -mArrowOffsetVertical,

                    !mIsAboveIcon, mIsLeftAligned,

                    mArrowColor));

            // TODO: Remove elevation when arrow is above as it casts a shadow on the container

            mArrow.setElevation(mIsAboveIcon ? mElevation : 0);

            setElevation(mElevation);

            mArrow.setElevation(mElevation);

        }

    }