Merge "Make AlteBouncerWindowVM and AltBouncerVM rely on same transition" into main