Merge changes from topic "am-3a638250-0228-430a-9592-99d4a7bd5036" into ub-launcher3-master

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