am 6763058f: am f61bc8a2: Merge "Bring task with root activity to front when launching from recents." into lmp-mr1-dev
automerge: df3d130

* commit 'df3d1307d5141c394b0eb521d6beb7f262fb3e3f':
  Bring task with root activity to front when launching from recents.