Merge "Only log resolution when starting activities" into oc-mr1-dev