Merge "Report Activity as independent change when config-at-end" into main