Merge "Fix stuck activity" into oc-mr1-dev