[automerger] Workaround for flicker between handoff from app to task view am: 35a6848fa8

Change-Id: Idcffacc752663758ac38937819457195b637ed10