[automerger] Fix some jank with transitions am: 118295e07c

Change-Id: I34ce1c1dcd0272680dd42c8a030fb063388a3376