Merge "Only associate the same windowing mode to a transition info" into sc-dev