Merge "Report Activity config changes only if it handles the change"