Merge "Improve first opaque activity candidate detection" into tm-qpr-dev