Merge "Merge "Generalize change transition into WindowContainer" into rvc-dev am: 66279fe1 am: e78f4015" into rvc-d1-dev-plus-aosp