Merge changes from topic "am-72640299b26a4cc6894c4dcc1567d3bb"

* changes:
  [automerger skipped] Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa74 -s ours am: a6280f7b -s ours am: e3e986ee -s ours
  [automerger skipped] Improve first opaque activity candidate detection am: bcf680d0 -s ours am: c32264da -s ours am: 8254561d -s ours