Merge "Fix leakage of DisplayContent referenced from TransitionController" into sc-v2-dev