Merge "Generalize change transition into WindowContainer" into rvc-dev am: 66279fe163

Change-Id: I26f3480c78c73f2a349d5608e7139a1c17301137