am c0e9c1d0: am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge: 7d1aded

* commit 'c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
  [ActivityManager] Set appropriate relation of task to home