Merge cherrypicks of [18247768] into tm-release.

                updateUnfoldBounds();

                return;

            }

            // Clear the divider remote animating flag as the divider will be re-rendered to apply

            // the new rotation config.

            mIsDividerRemoteAnimating = false;

            mSplitLayout.update(null /* t */);

            onLayoutSizeChanged(mSplitLayout);

        }