Merge "Fix issues in LayoutAnimationsHideShow demo."