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

Change-Id: I8ca9885abd09b5a60fc80c84567dc12b59356beb