Merge "Generalize change transition into WindowContainer" into rvc-dev am: 66279fe1 am: ac4a48b3 Change-Id: I1acbdd503bd5b0db3bfdfa94ea1a347eec11354e