Merge "Update the activity current config only if it is reported" into tm-qpr-dev