Merge "Improve first opaque activity candidate detection" into udc-dev