am af1c1b3b: Merge "softening app-to-home and task-to-task transitions" into jb-dev

* commit 'af1c1b3b1304f83570253f78666f8e8c77eef95d':
  softening app-to-home and task-to-task transitions