Merge "Optionally collect context in TestLogger"