[automerger] Fix some state issues with user-controlled animations am: 31fbd4c08b

Change-Id: Ia7ee40b542775dc45859028ba923e8edcc83401d