Merge "Fix activity manager timeout during shutdown" into oc-mr1-dev