Merge changes from topic "am-2daf2d01-d8d2-4427-ab77-387743f3fedb" into ub-launcher3-master

* changes:
  [automerger] Not sharing same task view between shortcuts am: 4d577fc1c5
  Not sharing same task view between shortcuts