Merge "Add logpoint location to ViewerConfigProtoBuilder output" into main