Merge "Switch ActivityRecord last reported config. to MergeConfiguration" into oc-dev