Merge "Add TransitionController to member of WindowContainer" into sc-v2-dev