[automerger] Fix bug where icon 'jumps' on long press. am: 31942e788b

Change-Id: I7090a0e5f6554a1f47d4939c25611fd18ec291c0