Merge "Protect against NPE thrown by flaky integration test"

            }

            // Stop suppressing the dot now that the flyout has morphed into the dot.

            if (bubble.getIconView() != null) {

                bubble.getIconView().removeDotSuppressionFlag(

                        BadgedImageView.SuppressionFlag.FLYOUT_VISIBLE);

            }

            // Hide the stack after a delay, if needed.

            updateTemporarilyInvisibleAnimation(false /* hideImmediately */);

        };