Merge "Fix crash when reordering overflow" into main

                if (parent != null && parent != mBubbleContainer) {

                    Log.w(TAG, "Found an unexpected parent for the overflow icon before "

                            + "reordering. Removing it directly. Parent = " + parent);

                    if (parent instanceof PhysicsAnimationLayout) {

                        ((PhysicsAnimationLayout) parent).removeViewNoAnimation(overflow);

                    } else {

                        parent.removeView(overflow);

                    }

                }

                mBubbleContainer.reorderView(overflow,

                        mBubbleContainer.getChildCount() - 1 /* index */);

            }