Merge "Generalize change transition into WindowContainer" into rvc-dev