Merge "Suppress layout handling during animateOut()" into nyc-support-25.2-dev