Merge "Reset mAnimatingExit flag while relayout visible window." into main