Merge changes from topic "am-9b5d6a359220449aaabb58bb1e48c1b8"

* changes:
  [automerger skipped] Merge "Improve first opaque activity candidate detection" into tm-qpr-dev am: 8f8baa74 -s ours am: a6280f7b -s ours am: 6e4ee7d4 -s ours am: 13b37cfd -s ours am: 804b66f9 -s ours
  [automerger skipped] Improve first opaque activity candidate detection am: bcf680d0 -s ours am: c32264da -s ours am: a67dcfb3 -s ours am: d4071de6 -s ours am: 6e45b099 -s ours